Fix slow downs
Changed map