Made title stuff more efficient