tweaked mattland a bit