Commentted some stuff