Fixed issue with subject line, minimized code, merge ready