rebase to current j.l.System class