Added many smart things