Applied the same improvements to get and run