Merged NewArhitecture to Master