Possibly solving the dependency issue but not sure.