latest update of scripts, needed to be cleaned up