Riaan: More prep for new setup solution.