Major modification for version 2.1