re-arranged some things