Updated tables to work