reorg and added moment helper