reintegrate parts from customizaton