More Update Improvements
Updated due to publish