updated and moved some depends around