Further adjustments for Moment