This update took a bit longer than I expected