Add Bartek modifications

Ref #7