Fixes part11,12