Updates per comments from malorisdead.