Updated vendors and changed some code