changed some dame handlers