rolled back adding shortcuts - perfomance difference not significant