Updated to skeleton code