b7fa269 Update scripts and tracking