Added BST, updated pup,