upgraded dependencies and adjusted for them