added find_units calls to rebuild task