Removed duplicate functionality