changes organization slightly