Updated popup to be for general use