removed extra conditions