Reworking some stuff