Trying to fix the implementation part