added topic 7, updated 1