started working on performance improvements