- refactored Objects, gained a lot performance increase