Chnaging the table structure based on the discussion with Professor