Added support for the format specified in the labo 2 statement