CODE: compatible with new markup