Manual update

Manual adding iAidan's commits.