Changed to take out conditional statement