Custom table final commits and changes