Made some changes for using vectors/disks. ToDo