Extended CL
Reworked conditions