Made more tests, waiting for Leo to get back to me