Revamped the disc finder