added endorsements and fully tested