Some changes dunno what exactly
AutoMerge