adding new conditions!