Replaced extract_token() with a completely new