KIWVR-798 Edit