Bug fixing and implementation!