More work on Writeup