Semicolons + better changed_when condition