final commit for stretch five