Removed duplicate functions