updated to include more topics