applayed mainstream changes