Docssa tidied and functioning correctly