better schema but not done