5/11 final commit