Change a few things that I learned in 1_7_10