Both functions added