New version, separated components