Modified for test
Modified the initializing process
Updated