More logical setup