johan's changes!  looks ready for the buttera competition now.