Added some new technology
Merge tech