New else-block added, some rewrites