Changed Paths and added Parameters for selecting