refactored for new installer