FINALLY, fixed dependency/requires issues