Added two new functions