adding few conditions