Added adaptive