small changes in architecture