Fixed code for no aging
Fix no aging implementation