Another stab at the shortcuts