#4 and #5
Removed hook
Revision is configurable