Moved accounting to one single place in Board.