final changes to #2A