fix+add back,end function