added shortcuts back in