Re-add Hooks

Now with correct formatting
Add some Changes