tables added and working