final commit - mjfii