Added two new functinos