Working on the implementation