Added thrid party code