Removed using holder and added using moment