move to properly named hook without pointless extra code