Finaly got it right I think