This will probably break some of jared code but i need to do a release :)