Added the 3rd party stuff