added more code to parsing functions