Updated for SunOS