changes in progress
made parser more flexible
slight change