finished ml second changes, back to walid changes