add back 2 functions