Added two new functions, coming up with more