updated with safari stuff