smj added ,finished