New for Entry Date

Replaced some code + added locals.  See diffs.