woop it actually works properly now!