Changes after comments