updated Carl's additions