Update from original

Update at 14 June 2014