more rework; lengthy process due to being from an alpha version years ago