Added two more functions