Rewritten to take advantage of shy-groups and