made handlers consistent