forgot to include @brandongoode's updates ...