Change to use butter instance instead