updated for latest dependencies