removed some hard-coded names...