Changes with Matthew and Matt's new design in mind