ver 2.1

Minor changes to code.