Redesigning architecture part #6