removed table
added map