Add improvements made by Kagee