rolled back a bunch of changes; better to use a Table