Reworking a few things