latest work, migrating changes from tucker