re-arranged some stuff