22-09-2014 afternoon commit with all module updated in advance calculator