many changes that I forgot