Version 1.1 - deleted unused function set and changed variable names