Fixing interfacing of the different functions