end 12/20 commit, many changes