added new conditions