Added option to specify one off custom scale.
Fixed bug with conditional statement.