moved the shorthand into the right place