Added automatic comment refresh