Added adaptiveness