All the 3rd party changes with some amount of dirty solutions