JBT - architecture modified