Added some funtionality.