Updated changes from Joel's feedback