updated. Need to write parsing fuction