removed duplicate functions