Working on performance improvements