Converted more to UNIX format