Change to one click method and an enum (missed a file)