Modified to use with goodQ - partially done