Updated to work with SWMH 2.85