Final Update with sample implementation