add most of requestedd by Dr.