Improved some moments