Added shorthand properties, attached interdiff for same. leaving it as NW, as...