added logic for support