Added tables, edited input