Kmj

modify for merge