Minor changes of skeleton.