#35 Enhancement verified