Bug fixing and part of the implementation