Changed per your suggestion below