Ok, I think I fixed it, please confirm.