Updated/tested with new dependencies