Header file name changed & more functions to do