Some more enhanced