added other functionality from SS