Changes with Mathew and Matt's new design in mind