As we decided. I have added all the relevant code.