7Nov 1

Still to fix