Re-added full functionality