rewrite schema AGAIN