merging in mnstrccks changes