removed table. added to generic"
merged