Some more basis
Fix C-i and details