cleanup working better. pretty close need jump to call cleanup..