adjusting some parts for xml