Update to submission

Work in progress