Rearchitected. Added replies