Finalising validation changes