Second draft and add pdf-output