minor changes, stable version