Finnaly make it works