Some bits reworked