Some moar changes