Adding more old code --kazu