not sure what I changed
many changes