refactored to patch and edge versions