Updated code to reflect paper tables