Adding sub hooks, formatting changes, scale changes