revamp the whole system architecture