Modified the mapper to include the quarters.