Tested and working.  Updated variable names