Added 2 Func