Better standalone functioning.