added latest alejandro changes
- lacks at least proper reference to table and correct size for table