Changing Basic Architecture, fixing Antique View