moar changes muahahaha