Addendum to the previous commit -- related to the common header in sim