a few changes. Lost track