possible legacy edits from trying to debug #169, change to timeline to close #173