Some modifications such that this branch works well with glob_25.