Added accountant logic