Handle reups better!!