updated objects to work correctly