Pulling Trevor's changes to the point conversion.