removed unneccasary condition