Both programs, updated