Now fully working