final commit, fixed table issue with hack