#40, updating condition