port flows to new classes