Added diagonal compensation