added parser and filename processing