New scale function & demo update