changed local directory
changed to user input for threshold parameters
conflicts resolved