updated according to Ron's first round of comments