New update handler update thanks to EliteJynx