Made changes, stable version