working on new build ps script which is cleaner that the old one