Updated with latest crap