Working on correcting simulator