New output format and some other changes