Some small work on adding moment