updated

genericizing things