updated before introducing xml