ray's latest changes