Hopefully all is fixed. I will have to write documention on how it
currently works