Update from RKB-F1

From Barry Nutley