Readded some change that was reverted during the reorganization process