Added in some hooks
Build might fail