Adding refactored Bart