Add armiller's changes, oops