changes here and there