restructured some stuff