Added global variables and updated paths