Major tweaks to git post 2