Added inline conditions