mlk update
some random refactor