logic changes --KW