Completed and debugged initial sim adjustments for testing