Changed to content script approach