VA work to tidy-up (untested, please dont use yet)