WIP to further reduce moment calls.