Fixing up script