Added conditions
Added conditions