This is the three commits compressed into one