New tokens

Useless check, $element always defined