More functions added