made many changes