Aaron: quick change to schema process