Making some needed modifications (again)