epic commit, need reorganization