Update to allow use on nib sites