dev-version

have some bugs