Little bit more comments