Added if and while