Working on the performance tweaks