Update from original

Update from original code 12-06-2014