changed per your suggestion below