some changes on simulation trying to make it faster