More stabilize and kind off working version