JAL-967, JAL-1114, JAL-1115 - modified render and calculation api to work on bare...