hashtag refactoring, add action end to end