Change to ReST and updated table