Changes and new options