fully working now