Dev version 1.2.1 - not adding an Object unless needed
Changed variable name removing underscore
Updated function & variable names to better reflect operation