Adding funtionality