Redid the whole boiler plate