more legacy code on new architecture