Updated to current configuration