finalll changes