Fuckloads of work on updating blocks