2 functions added