reorganised some stuff