Script changes, pbs support complete