changed table names and updated model and show