The portion you draw back out will not be deductible under the new rules since it is now being used as a personal savings and not for the build buy improve.
