ripped out more boiler plate