Previous implementation to adopt