Added custom functions