added improvements from AED needs