More work for the classical risk calculator