TMP commented out extra stuff