Working alpha. Minor cosmetic.