put thaddeus's changes with jayon's changes with jonas's changes without
wilson's changes :D 8==D