rename to handle_wrap and timer_wrap... should be removed totally on next update