Updated to latest scraps