Updated code skeleton