added 2 more columns and linked tables