Updated Funtionality