made changes to moments and style