changed for multiple handlers