#6 Work on topology