Funcion Addition & Bug Fix