BETA with several minor enhancements.