Compensations refactor 2