barely working again
works again mostly