- performed major refactoring to distinguish objects