Retrofit/Design Improvements and Refurbishment