Added 2 new functions