removed duplicate functions ...