added roll over handler