final few changes