merged with alfonso's additions