i tested the first version and i have made it better