updated table format, and linked input to data model