removed faulty wait-for-NC check, moved wait-for-resources check up