seems to be fully working now