made system more modular and standard.