Updated examples solution