add drawing macro and the mapping from Artur