Thanks for the reply,  yes I have been through the pain of doing this manually in prior versions, its still not perfect in 2016 / 2017 but a marked improvement.