Applied some changes according to the feedback from the architect manager