big revamp, removed table f