some modifications aye