Fixed defulat to be in line with moment, and renamed offset