removed unncessary condition