need to fix the age bug