JoeJR second commit after 2.1