Changed criteria table and data