THERE WE GO. Architecture changes done.