added names, removed ~ file