Completing implementation