Added boolean return value for on_condition method