Even more changes... hey, it's a work in progress.