Reworking some more stuff