Added two functions