Integrating changes requested by @tttopuz