Added full functionality