more changes from ASDS