KIENG-163 Edit