VID-269 Add some additional comments