changed file naming system to avoid -s