Support Tower 2

Changes to support Tower 2. Note these changes would replace Tower 1 support.