Improved method, changed variable name