refactured to xml
shortened prefix