Reworking a bit