frist addMoment copypasta
Revert "untested simplifications"

This reverts commit b65fba813a0bfc40e150728e0faf6d9d497b4d0d.