Updated version for chrome store