update + commenting code