Updated to fix comments