fixes and modification 12-15