Updates by AJ 12/2 AM