work on some modifications
