Bar modifications and added names.
More ignores.
Refactored names.