Updating to use Teacup