Updating Clirr behavior