fixes and modification 2-11