added third party stuff