continue Rebond framework refactoring