Revert back to initial Objects

Doesn't seem to work properly.