much nicer impl of New shortcuts