More development on the Tank example