after some quick fix almost thetre