Added 2 functions