Main programs, two modules added