Redesigned architecture