added to server and bookmarklet