cleaned up and added missing file