UPDATED to the latest dependencies