Next stuff

pull some changes...