changed comment scheme