Updated with some of my shit