Added dependencies, rearranged.