restoring some of Josh's work that I reset