modify 2 functions