Code now run without error in exiting
just merge