Uncomment working code