Prepared for dev
Fixed balance calculation