final changes for version 3 prototype