Changed codyco-deliverable source for simulator