reworked schema