Added long and short path execution