Changed to two tables