Made changes to definitions according to meeting led by Martin