cleaup
newcase now in one script