Brought code up to date with Mike's changes.