Added all functions