Added code for Tommy's table