handles non-mandatory stuff a bit nicer now.