added Paul's changes on Dec 4