Fully working now