Lets merge these two

Lets merge these two together.