Built Shmiddty's changes.