more code munging.