removed extra logic