Now checks for ? and handles it appropriately.