Adjusted some features