final commit for mid-term