move schema in
oops