Reverted some of the changes, stable