r1209 + adding recent cool DB upgrade feature