oops.. bring back the handlers