20140207: Updated with code running on user machine