some linking and new database changes