Changed to static functions