Extension of skeleton code