Added functionality to all the functions