working changes, test classes pending