merge with Thangs changes