Shortened

Took out extra negative cases.
TODO: Add the Y case