Updated to comply with 80-char width restrictions