Tweaked collect script