Full sim improvements