Some edits to 3 - still working on it