Some Mojaor Changes. sorry for late update.