Dustin's updates to version 18