Combined code

Not yet test
2nd Combine Fix