bring full functionality back after the split