Re-arranged some things