re-minimized

see test branch for less minimal version