new forms added. calculation changes up next...