Version 2.1-GP final and tested