reverted breaking changes. I will look into this when Ive got more time, but I dont want to leave a broken version up