Added all functionality