Current conditions logic improvements, #173