some adjustments in order to close the version