modified files to add location independency