Total reworking, taht version didn't work at all...