KIENG-147 Edit