Implementation updated