simplify logic for now