reoganized some things