restructured everything, shit's better now