More reworking... still doesn't look quite right on shrinking...