Added if statments