Updated with real comments