Additional changes from original repo