compensation handling done
compensation handler merged