reorg, added new questions