Updated to latest scripts