Fri 21 commit