more channges + commenting