New branch

Merged the two branches