Added a couple of comments and switched to v5.2 mode