Changes from home
merged simple sim