Change parse function slightly