RayJay upgrades

RayJay upgrades