Added some stuff that (hopefuly) doesn't ruin anything (yet)