XML needs t be fixed