Live condition refactor