Ok, you forgot to include your samples in code sections so I did not see anything ... I edited your comment :-)

Ok for your proposal. I will update