comment update, work still in progress