Now works on Chrome
resolving merge conflict