Prof Vun's changes, ready for submission?