Still adjusting slight details to  make up for path changes.