More work towards the revamp with new PIC.