commit from laptop
some rearranging