Added organ characteristics + budget controls