took out uneeded conditions