moved new split up condition