added correct and incorrect conditions