Made package less idiotic and therefore less state dependant