Issue #11 - Restore removed code