New version of ground truth, little changes to implementation