Changed some of the modifications

Made it so that only 1 check is needed. No longer needs all those ||
(ors)