now with all of n8fr8's updates