Updated with moar stuffs