added func
two changes