Implementation should work now.