Update: Supporting opera and safari browsers