Improve my C-a.
A lot of changes.