last version! (fixed table view crash)