assignment table cleaned up, #28