adjust order, add some notes