TESTING: Partial implementation of final revisions by Steven
final things