Updated Architecture - Few bugs still exist