Added adaptative