Updates on Gamma Tracking

See commits