Some magical code update...