change conditional return