better filenames - continued