Modified the way title's are handled.