modified for better localization