trying to fix stuff i broke :)