changes to keep working