Tweak/update CLI scripts