Updated income calculations