fix previous attempt at organizing