Made some modifications following review