Mods to allow table view to work