cont to fix comments