Improving function of program and expanding for future features.