- added TABLE and TOWER defines