End in sight for Napier Street upgrade in White Hills