changed key/filename stuff