update old code; refs #5