Added some hooks, made it so everything is 100% stable