Commit with updates 9/12