New functions integrated into old source.