merge conflict
SMJ almost done