version 2.1. Added legacy support for butter