Pt 2 of previous commit