#62 Modified comments