Full redesign of the system