Updated head-fork and base-fork