changed handler position