Commentted line 67-69