added code to parsing