Modified to 80 char columns