More updates fixes and putting it in Simulation