Updates for working rayo