change: change format of functions