Many changes here and there