i hope this is final version for simulation