VID-123 Add some additional comments