UpdateHandler is now more efficient