about to merge code with ray's code