Updated to 2.5
Reverted use of working_directory variable