Two functions added