Added some conditions!